Don't repeat at load time any bindings that are autoloaded.

diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index 24dc1fc8f4035474762467634c414fb5e8d4c06e..a44e2153aa0de5e7c9b11c5b73810a88a65b5420 100644 (file)
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -106,7 +106,8 @@
 ;; These are the distribution keybindings suggested by RMS, everything
 ;; else will be done with M-x or the menubar:
 ;;;###autoload
-(if (symbolp (key-binding "\C-xr"))
+(if (or (symbolp (key-binding "\C-xr"))
+       (fboundp 'bookmark-set))
     nil
   (progn (define-key ctl-x-map "rb" 'bookmark-jump)
          (define-key ctl-x-map "rm" 'bookmark-set)

diff --git a/lisp/dabbrev.el b/lisp/dabbrev.el
index d2f746b6c3191ae2eec155308f3ff59ef1028dc6..e89e8d13aa706618ec3844a9e53fc1f40ce9356c 100644 (file)
--- a/lisp/dabbrev.el
+++ b/lisp/dabbrev.el
@@ -205,8 +205,7 @@ with the next possible expansion not yet tried."
       (setq last-dabbrevs-expansion expansion)
       (setq last-dabbrevs-expansion-location loc))))
 
-;;;###autoload
-(define-key esc-map "/" 'dabbrev-expand)
+;;;###autoload (define-key esc-map "/" 'dabbrev-expand)
 
 
 ;; Search function used by dabbrevs library.  

diff --git a/lisp/edmacro.el b/lisp/edmacro.el
index 78e7406b645a0b0efe621f75ea38c1965bec9a65..ab2a6c1631f25cdf42b4bee7d4fc262fb2756f20 100644 (file)
--- a/lisp/edmacro.el
+++ b/lisp/edmacro.el
@@ -74,7 +74,6 @@
 ;;; The user-level commands for editing macros.
 
 ;;;###autoload (define-key ctl-x-map "\C-k" 'edit-kbd-macro)
-(define-key ctl-x-map "\C-k" 'edit-kbd-macro)
 
 ;;;###autoload
 (defvar edmacro-eight-bits nil

diff --git a/lisp/macros.el b/lisp/macros.el
index c2e8b18b4aff455be5a0be709e4039a648960f9c..1e093a7630a56b2e7b1d35c8e68fc33741adc6aa 100644 (file)
--- a/lisp/macros.el
+++ b/lisp/macros.el
@@ -235,7 +235,6 @@ and then select the region of un-tablified names and use
       (set-marker end-marker nil)
       (set-marker next-line-marker nil))))
 
-;;;###autoload
-(define-key ctl-x-map "q" 'kbd-macro-query)
+;;;###autoload (define-key ctl-x-map "q" 'kbd-macro-query)
 
 ;;; macros.el ends here